Updatet3olayout3 0 4

Merged Harry Glatz requested to merge updatet3olayout3_0_4 into develop

Merge request reports