Merge "Fixing optimization in Task loading. (Bug 16372369)" into lmp-dev