Merge "Create-user logtag and re-order"