Merge branch 'fix/i18n.keys.js-empty-decl' into master
(cherry picked from commit a42a88696aa093330bc7427c565bbdeac1216e9e)