Merge remote-tracking branch 'phonohawk/ticket-7498'