clean unused resources
Merge branch 'release/post-work-v1.1' into develop