Re:# 1703 - null pointer fix
Merge branch 'ticket-1703' into develop
Merge branch 'develop' into test