Merge "Add related test to Bug #1732428"