Central develop merge

Pulling the changes from the central server into develop.