Merge "Better public volumes handling on secondary users." into pi-dev