[vlmc/f26] (5 commits) ...Rebase version