fixup commit for tag 'unstable_2_0_5'