This has been added and this PR is ready for review again.