[BISERVER-10656] Dojo changes