Finished cherry picking
Updated release number