NEXUS-5755: Fix for eca13f23e3bc40511e929aeed99a903cbb501e4c