Some merged changes and added (flow/add-myself flow)