Remove overlay option
Merge branch 'debian'