RF-13739 workaround added, all tests now pass