Merge Devfeatures to master

Merged code from updates 0.9.3 and 0.9.4