Merge "Squashed commit of the following:" into jb-mr2-dev