[15.0] rma: alignment of code from 14.0

[15.0] rma: alignment of code from 14.0 #1550