Merge branch 'CherryPickHomework' into 'develop'

Cherry pick homework

See merge request R3/school/basic.git.practice!60
2 jobs for develop
latest
Status Job ID Name Coverage
  External
passed jenkins

passed jenkins