Merge pull request #4048 from kumpera/iface_casting_cleanup