manual non-breaking merge of feature/create-node-app