Javier Macghey lock-upgrade5987