Merge branch feature7928. It includes feature5837