Pull original changes

Merge original repository changes