(cherry picked from commit fd0970abdfc80fe92cf6b87ed6b6987526919035)

Conflicts:
	modules/access/dtv/bdagraph.cpp