Merge changes with fork

Merge changes with fork