F21 Self Contained Change: Improved Scala Ecosystem Support