critical caching fix
Merge branch 'feature-portal' into development
re-add installation files

made an mistake..