[vlmc/f27] (4 commits) ...Rebase version