Probably good for CURRIKI-6672.
paul