Merge branch 'tg/ce-namelen-field'