Merge branch 'sa1100'