Removed changelog (the issue was invalidated, and opened new issue to fix this problem)
Merge branch 'issue_251' into issue_253