Issue #3240988 by kristiaanvandeneynde, Berdir: Not marking service definitions as public is deprecated
Closes #3325994