Refactor stage 4.5 to be in line with stage 3.
Merge branch 'dev' into dev-stage4dot5_refactor
Merge branch 'dev-stage4dot5_refactor' into dev
Update changelog.