Merge up to date changes from the dev branch
Insanely pedantic import order fixing