Added aditional validation for external object
Merge branch 'dev'