#3753: tested new context apptoach
new context approach merged into master