Merge "Fix specs for custom bp" into main