Merge remote-tracking branch 'origin/pr/2664' into development

* origin/pr/2664:
  test: Always use `make clean` by itself