Merge "Add more allowed 'dot' alternatives"