No need to use the caching mechanism when called once
Small refactoring
Update ori_por data
Minor bump
Update tests
Merge branch 'public' into 3000
Merged with public