Merge tag 'jvstm-2.3'