STF593 merge stf-593 to develop

Elian Krajarequested to merge
stf593 into develop

Final draft to be merged at develop

Merge request reports