minimum fix for running test
Merge branch 'topic'