Merged changes from main branch and added 404 status code to notfound case