Merge missing shared changes from GPL 3677