final for CURRIKI-6672
paul