user multi bu, fixes and modifications
Merge remote-tracking branch 'remotes/origin/fixes'