Merge "Removing crosshairs" into jb-dev