Repackaged commits and cherry-picked !286 for master

Repackaged the changes from !286 (merged) to be merged into master. Please wait for at least one nightly run before merge.

This needs !358 (merged) and thus also !360 (merged) to be merged first + additional modifications afterwards.