Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev