Changed some static objects to non-static
Merge commit 'b26ed2e' into develop