Merge branch 'topic/odk_cross_fix' into topic/save_ona_crosses