Merge updates from Heard Library repository