attempt at CURRIKI-6631.
paul