merge branch 'gh24' into 2.x