Merge "add support for local package repos indication"