Merge "Make assignment of mPlugin members consistent"