11.9.12 merged