fix unit test build
Merge branch 'master' into interactive-experiments