Merge remote-tracking branch 'github/bug-1305' into test2-1260