Merge branch 'release/7.x-0.31' into develop
update to handle namespace in agency element, and add fallback
updated to version 7.x-0.32
Merge branch 'release/7.x-0.32'