-Extended customer resourcebundles
Merge origin/master