would people rather I cherry pick individual fixes for the RC issues or merge in changes from master?