Note: All branches with names like 'aa/{name}' are used for personal development and may be subject to rebasing. They will eventually be (squash) merged and then removed. You should not use any of those branches for your own development. Development happens in the 'dev' branch, and code is eventually merged into the master branch.