Merge "Change parse logic for complex flags"