Okay to fix the other KF modules directly? Commit message okay for copy&paste :) ?
@vkrause @nicolasfella