Applied change described in b6b0f7d6ced8ad4d0b3da15853a8788e6e635357