Fixes DEVELOPER-427 (RHT link)