Update dev to latest stable

Update dev branch to stable