Fix possible bug in core/ICF_Model when comparing num_rows()
Merge branch 'feature/app-cores' into develop
Merge branch 'develop' into feature/settings