keeping in synch with core develop branch