ML2 related updates