LB-564

This is necessary for LB-563, and probably for LB-509 as well.