Merged updates to app into jdk16 branch for testing