Rebases #5449, Converting comments to entities