Merge branch 'release/7.x-0.6' into develop
add isset() check on variables
Tagging version 7.x-0.7
Merge branch 'release/7.x-0.7'