[flowblade/f24] (8 commits) ...fix merge