Update from RockWeb core (ef6)
Merge branch 'origin/develop'