Merge "Followup da433140: add one more test and release note"