Integrated changes from voznesenskym/AMWaveTransition