Merge branch 'S4-44' into dev