flax

b9bbc986 - Merge pull request #4229 from wenscarl:scale_type_fix