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