Updates for 3.40 + new sample