Merge branch 'jc/apply-3way'