start of masked value support