Merge branch 'test-cases-mox-setup' into 'develop'