Today
Merge from naval_cleanup_scientist_fixes