Merge "fix the build for Frankfurt and elalto maintainence"