Merge code from update-parse-plugin branch
Add support for clicked notification