Fix for "Ensure set_prepare_statement is called once"
Merge remote-tracking branch 'upstream/master'
Merge with upstream