Improve patch AMBARI-6484