Closes #3214510 - Sorry please have a look at the final (sqashed) results, the first commit was unrelated and didn't belong into this issue fork. I reverted it in the last commit.