Merge remote branch 'kaner/bug_1613'