catch up with fixes in 3.6 M3
13 files changed