0916 merge