Bug Fix: #379026, #379016 - associated payment code