First pass at #233 (O000169.yaml)
Merge pull request #772 from amit/master

First pass at #233 (O000169.yaml)