Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev