CRP-0606-merge