Integration testing for #8976
Merge branch 'develop' into #8976

* develop:
  Integration testing for #8976