CC-1469: Crossfading support (non-equal power)

-cleanup