Merge remote-tracking branch 'origin/alyssa-omega' into brian_omega