Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE" into oc-dev