Merge branches 'arm2', 'arm3' and 'arm4'