RF-13301 refactored