Added new feature for NIBS
Merge branch 'feature-nibs-requirement' into develop