#2251 (closed) merits being included as a fix in the next 2.0 maintenance release.
Ref: Support ticket #19717