Merge "Update to recently created elalto branches"