Merging changes to remove warning on bcon class