[#1036] Function was not defined
[#1040] fix license translation
Merge branch '1036-fix-broken-org-code'
Merge branch '1040-license-fix'