Fix #435: Assertion if replace _cluster tuple
Add a test case for #435
Merge remote-tracking branch 'origin/gh-435-replace-cluster'