Fix missing content from EUCA-7814 merge