Picking up aai/oom from the master branch