CURRIKI-6620, CURRIKI-6621, CURRIKI-6622.
paul