Master 3.0 merge