Commit for v 7.x-1.6