Merged 6444 ticket