Prepare to Merge

Prepare to Merge
Merge remote-tracking branch 'origin/stat-test-2---debug' into StatTest(MrMihap)