Merge "storaged: owner adjustment"