Fixing TOOLS-2473 - Local Entry properties issues