Updating dev with latest on master

@Praburaj @glennc 

Updating dev to have latest changes from master
Remove this line or alternatively remove this `dependencies` node?