Shirley Descoteaux lock-fix9167