Merge branch 'release/7.x-0.20' into develop
add check on isset() before foreach
release 7.x-0.21
Merge branch 'release/7.x-0.21'