Updated to 5.6.5 and 5.7-m22