Revisit resource method null handling
Modify the CHANGELOG
Removing uses of deprecated annotation