Merge branch 'hotfix/1.11.15'
Added ignore
Handling of missing sub_id
Merge branch 'hotfix/1.11.16' into develop

Conflicts:
	.gitignore