Lcg/500 errors 11 stable

I think we should call it 11.16.4 since we're shipping only a single bug fix. 

Also I've just merged the backport of the code change (I don't think it'll be a problem for your PR but FYI :smile: )