Merge branch 'BS-6668_CustomPage' into 'master'
[TRANSLATION] update portal.po
[TRANSLATION] update translation files
Merge branch 'master' into 'BS-6668_CustomPage'