Merge "New maasng module implementation"