Updating app to use on cedar.
Merge branch 'cedar'