Merge "Resolve some TODOs in appfunctions" into main