merging from github:lemo/overlay into github:lemo/lemo-overlay, source overlay will be deleted