Merge branch 'release/7.x-0.2' into develop
add variable check
Tagging version 7.x-0.3
Merge branch 'release/7.x-0.3'