Merge pull request #2249 from arm-in/master

Add variants