* fix #29614 * add change log for #43342 * Cleanup tests and add tests for this scenario Co-authored-by: ptux