Merge pull request #3184 from ilya-lavrenov:arm