Fix #6742 - locking issues
[Pman.Core] / Pman.Remarks.js