Merge branch 'manual-rework'