Issue #2342949 by rpayanm | larowlan: Cleanup BlockContentBlock.