Merge commit 'origin/bug_590'