DOCS-954 eval and locks