resolve include problem and some residual part from component
Merge master