Merge pull request #3285 from ktsaou/master

unit scaling improvements;