final commit for 5.2