Revert "Revert "refs #33274""

Reverts aipocom/aipo#486