fixing flag:closed #29
Merge branch 'release/1.3.16' into develop