Closing this as and not committing the patch as this was marked fixed before ...

Closing this as and not committing the patch as this was marked fixed before and the changes are due to issues-3048150so these should go with latest patch of that ticket.

Thanks