Re-branch from master with dev branch updates