Merges the fix in !11910 with the existing code

Ghost Userrequested to merge
(removed):11910-improv into pregmod-master

Merges the fix in !11910 (merged) with the existing code

This has been tested and is ready for merging

Merge request reports