Merge branch '6365-core-reviewing-how-the-locking-mechanism-logic-work-general-lock-supann-lock' into 'dev'

Resolve "[Core] - Reviewing how the locking mechanism logic work - general lock - supann lock."

See merge request fusiondirectory/fd!1105