PR: 62750 62751 Submitted by: Daniel Roethlisberger <daniel@roe.ch>, David Gilbert <dgilbert@daveg.ca>