app_cell_id -> app_cells_id
Merge branch 'develop'
Should fix that one too
Merge branch 'develop'