Merge branch 'p54' into everything