Renamed to avoid adding names to the test files
Merge remote-tracking branch 'devel/no_wrap_bug' into devel-master