Merge remote-tracking branch 'origin/development' into development
Merge remote-tracking branch 'origin/development' into development
* Improved performance by chaining the checks
* Added 2 more checks for ax5 institution