SI-6411 SI-7328 value class fixes for runtime reflection