Merge branch 'hotfix/1.24.1'
Added debugging messages
More debugging and lowered log level
Added empty map handling
Merge branch 'hotfix/1.24.2' into develop