Updating dev with latest on master

@Praburaj @glennc 

Updating dev to have latest changes from master