Updated to 7.23
Faculty updates
Merges