Merge "fix the elalto and maintenance release"