Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev