Merge "Implementing Gainmap support on BRD"