Patches implemented in [df97fae2bd9f248be08]