Create new branch named "v1.61-db-refactor-shoeb"