added optional support of the imageproxy
Merge branch 'release/2.1.0'