Merging tw-temp to master

Merge tw-temp with master for changes