Merge "New controller support from BRMSGW"