Built Elirada from commit eda2423 on branch dev