Readded _courseId to schema
Merge remote-tracking branch 'origin/develop' into block_crud