Merge "Fixes for optical bounds feature." into jb-dev