Ported BC trigger code to 1.5.2