add test for c2edf4470f6e47c4013f12f1314843ee645d65af
Merge remote-tracking branch 'upstream/develop' into develop