Ticket/15915

This pull request is just for comments.