Revert "Revert "prepare rebase test""

This reverts commit a2024f82db18e1a16658dfcfd94c8ddbda726cfe.