Workaround #32 (CC @ericof)
Fix RF tests (CC @dadlo)
Merge branch 'master' into task_9029