Fix #361.
Fix #364.
Refix #361.
Tweak for #362 if MDL-36499 solution applied.
V2.7.9d
Merge remote-tracking branch 'upstream/master'