#21662 added public ids