Fix directory recording
Fix action in admin pages
Merge branch '3.3' into 3.3_odttemplateproject