Merge latest fixes from EE LTS branches