Sync with recent changes

BBGMN-1227 Fix
Trac 319 fix
Additional Tests and CSS file