Merge branch 'S4-63' into piper