Merge changes from topic 'fix_oom_master_dist'