Merge pull request #84 from bravewick/OneZeroOne

RELOAD-197 RELOAD-194
RELOAD-192 Fix the server crash of Test Case 4 in issue description