Mervin Thibeault lock-fix7447