Merge "Update ternary notation"