117b9c9 Update kernel/base

Authored and Committed by jheger 5 years ago
    Update kernel/base
    
    Merge of downstream changes.