Marko Haining lock-fix9885