Improove the NON-JS version for institutions
Approve style
remove comment
Merge branch 'DDBNEXT-1502-BOZ-v2' into develop