Added code and hidded field to carry over skipOEM flag