Merge branches 'listAllMocks' and 'editMock'