Fix CircularDependency bug
Fixed keywords
Merge remote-tracking branch 'remotes/angathorion/keyword-fix'
Reparent first after updating to graph
Merge remote-tracking branch 'remotes/evansb/fix-cc-bg'