Merge branch 'trunk' into AMBARI-25035-trunk