Merge branch 'jd7' into 'develop'

lead contact update and default value chnges

See merge request !60