[DO NOT MERGE] this is part of the support/3.4
branch now
#607
+24
−6
support/3.4
branch now
#607