push spinner to front
Merge branch 'master' into test-interface