merge aac-rebased branch into master, squashed branch commit history - not needed in master history.