Fix contextDependent computation logic.
Merge topic 'optimize-source-file-processing' into next

dec486cd Fix contextDependent computation logic.