auto-calculate test
Merge branch 'master' into HEAD