Split hot fix up into finish to master then finish to develop