I assume that you'll want to fix bug 987323 and bug 987462 together. We will wait with the maintenance update for the second submission.