Merge "Optimizing: Do not depend on sharpening in test 577"