CA-87377 

This commit should improve things on CA-87377. Please merge it.