quick fix
Merge branch 'version_2_4_2' into version_2_5
Merge branch 'version_2_5' into version_2_6