semantic: More AA stuff to be rebased