Preempt some commits from !798
Cherry-picked some commits from !798 (merged) to have them in master already.
Thank you for your patience. The maintenance has been successfully completed.
Cherry-picked some commits from !798 (merged) to have them in master already.