tidy up
merge changes to Ict.Common.DB from upstream