Merge "disable helm addon ootb"