LPS-38092 Added fix equivalent to the one in LPS-20720, but for mount point folders