Merge "Fix issue with setting of thread name"