merged issue #4