fix undefined -> error getting data through wrong source
use same syntax everywhere
bump version
Merge branch 'release/2.6.1' into develop