Bugfix ip of support prop
Merge master branch with 'bugfux_ip_shelves'