Release 3.6.0 merge