Latest Bay Merge

Merging the latest bay into Eternal master.