CURRIKI-6624 and CURRIKI-6623.
paul