Merge branch 'tb/pack-preferred-tips-to-give-bitmap'