Minor Bug Fixes
DP Bug fix
merge master to multiuser