#318975 please split into separate library packages