Latest changes from Squiz