NEXUS-5755: Few more