Merge master to scl-fixes-1