fix merged tests conflicts
Merge remote-tracking branch 'origin/135' into 135