Recommitted as the last update was provided in error. This is the correct version.
Authored by: evanvennn 2017-08-25
Parent: [r602]
Child: [r604]
