Revert 7abf18a16
Merge branch 'fixes/0.27' into stable/0.27