merge feature_megatest branch
see CHANGELOG, bump version to 2.4.6