Merge remote branch 'origin/trunk' into HIVE-4675
Merge remote branch 'github/HIVE-4815' into HIVE-4675