Sync changes from /h-hermsen/library to /i-campbell/library
Authored by: i-campbell 2021-01-17
Parent: [r678]
Child: [r680]