Merge "Don't show unset score values for AccessPoints." into oc-dev