Crm 12603

I think this pull request is done correctly for 4.3, but you should check as it is my first one.