NEW: Aligning 1.6.4 branch to the features in 1.7.10 branch