Merge "Second set of after review changes"