Merge changes I83c64de0,I61c3e3af into stable/hunter