#642 - Added sort order for existing survey sections.
#642 - Removed unnecessary exception.
Merge remote-tracking branch 'origin/t642' into t642