Implement issue #6646859: 4K!!!!  4K!!!!  4K!!!!

Change-Id: I1bb630c58d0d41446b726de1b9d2c3875fcbbceb