This is still an issue for my company as well and we are on version 21.13.5058.7951