Merge branch 'pw/am-signoff'