Cherry pick INTEGRATED-941 for 0.6

Requirements

• was added to 0.4.1 and should be added to 0.6 as well

• Note: 0.4.1 has some custom changes, to a simple merge is not possible