#25841 - Add more metadata around creator and modifier