NOTE for Merging - do not port this commit, since the changes here are utterly irrelevant to the new system