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