Develop to Master

Merging based on the September launch.