LPS-43511 Fix subfolderId recursion
LPS-43511 Changes usages of deprecated method
LPS-43511 Regenerate