I'm merging this fix together with fix for: LP: #1811496 in a new merge request, respecting credits, and link it here.
I'm merging this fix together with fix for: LP: #1811496 in a new merge request, respecting credits, and link it here.