apply fixes from RF-13405 to RF 5 changes