Commit of 1.6.2 update