Merge "Fixes for MD-FRM"