Re-align companion support to RSRD version #140