Merge "Review dev guide"