Agreed: 'This is a workaround until SPR-8818 will be resolved.'