Merge: latest fixes from master