Merge branch 'resolve-srand'