Merge "fix for the elalto maintenance release build"