Fixed SOPE include path
Merge to 2.2.2