Merge remote-tracking branch 'origin/feature/508/exclude-for-sourcecodeparser' into feature/508/exclude-for-sourcecodeparser