Merging armoo branches