Merge branch 'master', remote-tracking branch 'origin/master'
Working implementation of DynamicNodeController completed, close #7