RF-13250: applying patch

Please pull patch backport for RF-13250