Should this be part of this PR? Or will the adoption of the scaladocs be handled in another?