update from RockWeb core (ef6)