Merge tkdbmonitoring_70x into tkdbmonitoring_71x