Removed BOM
Merged from master