Reflecting "haxxxx" recent 5.2 changes

Reflecting "haxxxx" recent 5.2 changes for Frost DK.
Merge pull request #208 from nishikazuhiro/patch-10

Reflecting "haxxxx" recent 5.2 changes