Merge "Add support for current failed lock attempts and max attempts" into nyc-dev