Do what Hound says

Woof woof!
Merge branch 'staging' into 961-folder_creation