merge from val_prop_plugin branch