Merge branch 'mh/test-keep-prove-cache'