Workaround in case we ever move back nsieditor as builtinclass
Merge remote-tracking branch 'refs/remotes/origin/master'