Merge "Reformat non-RD coding flow"