Merge "Add fluorine support"