Merge branch 'initial-node-conf'
Merge branch 'master' of https://github.com/beogip/beoAi