fb assignment fixes
[Jenkins Integration Merge] Merged fb-assign-fixes into master