Update master to current head-tracked state of the project

Just want to update the main branch of the project to the current state.