Merge from original Seyren project.