override control of standard gates where possible
#3631
Merged
control of standard gates where possible
#3631