Fixed the bug.
Merge branch 'refs/heads/hotfix2' into dev