Merge "Improve javadocs of app functions" into main