Merge from `elmo-lunafy' branch.