- Changed retrieval of subfolder by folderid
Merge remote-tracking branch 'origin/jpa' into jpa