This results in much smaller file sizes with the same quality (cherry picked from commit f84c6df8d1)
f84c6df8d1