Merge branch 'devl/cleanup' second round