EE Port of "Lock discussion for issues and merge requests"

Merged Jarka Kadlecova requested to merge ee-18608-lock-issues-v2 into master