F21 Self Contained Change: Apache Hive