Merge branch 'stf644' into 'master'

STF644 - Milestone D - Merge stf644 to Master branch

See merge request !7