rebase crud v2 on official manager
Merge origin/master