make this feature configurable
Merge branch 'HHH-4910-functional' into HHH-4910