OrlaM

@Prurite This is very much on our radar and we are actively working on addressing the technical debt that will allow us to enable this feature.

@travis79 What is the status of this PR? Are we still planning to move forward with this change or is it on hold indefinitely?