CURRIKI-66117 (also relevant to CURRIKI-6628)
paul