Merge commit '637a8d84bacd0b6973a16843259f0c11845f2cd2' * commit '637a8d84bacd0b6973a16843259f0c11845f2cd2': Fix regression in OBB key handling
Merge commit '637a8d84bacd0b6973a16843259f0c11845f2cd2' * commit '637a8d84bacd0b6973a16843259f0c11845f2cd2': Fix regression in OBB key handling