Completed Orientation and Partial AI (reverse-merged from commit 58292257647828d664fde39eedd4911355558462)
Merge branch 'refs/heads/OrientationRedo'