Bulk code change
Merge branch 'master' into start_from_scratch