Merged fix for trq-1739: cannot compile with BLCR enabled from the 4.2.2 branch.