CURRIKI-6640 and CURRIKI-6641.
paul