Merge "BUG:5888 - Changing FRM from clustered DCN to clustered DTCN"