Fix lock and add dependencies

Merged E. Rivas requested to merge er433/fix/lock into dev
  • has a changelog entry
Edited by E. Rivas