DESCRIPTION

CBQE-1531: add some fixes

Change-Id: Icdb3a85b2601a90b6f57cc3c3b14db43cc89ad24


COMMENTS

