Merge branch 'rhash_prove_locking'