Additional CL for fluffos-3.0-alpha6.1