TestCase1 & 2
Merge remote-tracking branch 'origin/develszaki'