fix 250
fix 240
Merge remote-tracking branch 'upstream/master'