Merge "Sync HISTORY with RELEASE-NOTES from REL1_18"