Update and fix for current, superceeds ports/46760
State Changed From-To: open->closed Commited, thanks!