Make parameter extraction more robust and ignore magic#16

pont-us merged 3 commits intomainxcube-dev/xcengine:mainfrom

pont-14-handle-magicxcube-dev/xcengine:pont-14-handle-magicCopy head branch name to clipboard