Bundle update
Fix i18n deprecation warning
Update RSepc syntax and do some refactoring