Update up to changes in hold/release handling