Merge missing changes from bug#68677, bug#68784, bug#68785.
Created attachment 108946 [details] Fix
Fixed in r96178