Fixing CURRIKI-6575 and CURRIKI-6576.
paul