Merge pull request #506 from kanoi/master optional lock reporting in the API and klondike work redesign