BUG-1460: make sure DCL works

As the bug correctly notes, the check of non-volatile field can result
in bad effects.

Change-Id: Ifd0d72c28fe53692b037c2ecf861d36d312b4182
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-1460: make sure DCL works"