#1169 fixing duplicate context issue, introducing integration test proving implemented solution works properly
#1169 fixing duplicate context issue, introducing integration test proving implemented solution works properly