#7987

Yutaka Emura
Keymaster

I fixed 1). I will remember 2) when I do major upgrade in the future. Thanks!