add definition for #599, only works on kato
Merge remote-tracking branch 'origin/master'