Merge "Add conditional class starting"