iss53: fix 23 for remote testing
iss53:fix 25 for rebase test 1
both: fix 26 for rebase test 2