Merge "Fix software layer alpha" into nyc-dev