953848 - adding custom info to system breaks further manipulation
with that system
Merge pull request #2028 from komidore64/953848_custom_info

953848 - adding custom info to system breaks further manipulation