LPS-40677

Hi Eduardo, I'm sending this to you for review because it is somewhat related to the remote locking issue you worked on. Thanks, Zsolt.