Merge "Uplift of sub module"