3614736 - add extra properties port from 4.x.

Closes #3614736

Merge request reports

Loading