Merge branch 'master' into raman/master/cluster_active_wait