backport object manager updates