Merge "Adding FIRST_N_SAMPLES without trigger support"