Exo val dev

supersedes #5105 and #5313 
@ndaci