Merge "Add support for debug get/set element" into jb-mr2-dev