Merge "Zen Condition text and primary click changes"