Merge "Fixed incomplete OSEN config code." into nyc-dev