manual merge
work around import bug in test rig
manual merge