Merge changes I9b371e44,I79c404d4 into stable/hunter