Merge branch 'S4-78' into piper