Merge branch 'dz/apply-again'