Merge "Various bug fixes to make ZSL work." into jb-mr2-dev