Update branch with latest master commits

Merge all working code