CID-1114601 to 1114604 Recommended practice is to test the result of
skip and read for EOF
CID-1114591 Replace duplicated functionality with a call to super like the other state classes
CID-1114592 Replaced duplicate code with a call to super
Merge branch 'bugfix/CID-1114601'
Merge branch 'bugfix/CID-1114591'