Re: plasma-5.17.x for f31 (and possibly f30)