CYKLO-916: workaround for javac "inconvertible types" error
release 2.24.5