Merge pull request #533 from dshurt/v1.2

Various Fixes
Quick commit to avoid merge conflicts.

Working on fixing reviews.
Merge pull request #534 from Jedwondle/v1.2

Quick commit to avoid merge conflicts.
STORE-314 Submitting Reivews (concurrency) sometimes causes an error