Fix for issue #971 and issue #1007 - defaults to a status of UNKNOWN if a empty result is returned
Merge remote-tracking branch 'origin/develop' into develop