Split master key & partial fix for uid order