Merge commits from main repository

Merge in todays updates