merged 6.1.2 updates