Merge branch 't15_cleanup'