Merge remote-tracking branch 'origin/master' into dev-amplify
adding dep for pdf_reader as requested by @jonpugh
Merge branch 'feature/deps-for-pdf-reader' into dev-amplify