Latest Sprint 27 code

This is an update for the latest Sprint 27 codebase.