Merge "Make the debug logging in pip menu more flexible"