no longer marking annotations as provided
no longer running scr-plugin by default
Merge commit '9dbbf635ed94bd0a3dd3e2dea7cdef55eaf2fad5' into HEAD