No matches were found for subject:"\[jira\] \[Updated\] \(HIVE\-11170\) port parts of HIVE\-11015 to master for ease of future merging"