TestCase3 & 4
Merge remote-tracking branch 'origin/develszaki'