Merge branch 'factory_4.6.5' into 'factory'