Merge remote-tracking branch 'origin/master' into cve-9.16

# Conflicts:
#	docs/en_US/release_notes_9_16.rst