Merge "Remove scaling bucket hack" into lmp-dev