Re: #6025: Unblock xpa package in current release