Merge branch 'S4-69' into piper