10 Commits (CLDC-3345-replace-created-by)