Prepare fork release
Revert
(cherry picked from commit ddb47c5)