Consolidate commits to 0.5.1 section before merge