Cornsilk 14 11 acu169058 right net refactor

@dominicm