Merge pull request #5270 from vgaetera/iface-lo