[1856] Added locker decorator