refs #1337 move System.php changes to core
Merge branch 'dev' into test