Merging latest development code from base repository.