fix 3.3 merge for all commits in #746

#746