Merge "Adding l2switch features"