Merge branch 'release/7.x-0.2' into develop
bug#16895: active close button, and code cleanup
updated to version 7.x-0.3
Merge branch 'release/7.x-0.3'