Non-coded fixes dotstatsuite-core-transfer#698

Balazs Szilagyi requested to merge 698_fix_noncoded_issues into develop Feb 16, 2024