last commits for 3.6.3