bug fix and whats_new
Merge remote-tracking branch 'origin/fix-1026' into fix-1026