Merge branch 'improve-rm-planning-process' into 'master'