Merge from my office

Finished till Multi Thread till 12.01 till 12.13