Resolve 1242-b_024-optimal-template-journey-step-4-a-template-spacing
requested to merge 1242-b_024-optimal-template-journey-step-4-a-template-spacing into 1226-b_024-optimal-template-journey-overview-and-main-epic-branch
This contains the (almost done) changes of epic branch #1226 (closed)
Closes #1242 (closed)
Edited by Hanhoan Truong