Commit of 6.1.19