merging v0.54 RRP changes