* Applying fix from Thilini for TOOLS-2393.