Merge "First split of support-v4 into two modules"