Merge branch 'sa1100' into devel