Multiple mapping are not properly managed on pp upgrade (PR #145)
Service discovery is run on disabled hosts (PR #174)