Merged Cory's ORIENTATION_SIGNAL section updates