Merge branch 'sii-m15w' into upstream