Rename NOT_FOUND to notFound
Merge branch 'dev'