Merge branch 'amf/LDXSG_fix_playback' into 0.42.1_staging