Merge "Small WhitenessUtils changes" into lmp-dev