Fix in keyword registration

(cherry picked from commit e5679dadda7e6ad308b841f02cf2f5f0925af3c2)
Merge branch 'v2.0'