Merge tag '0.9.6' into develop

Released-0.9.6 0.9.6
added order option to a collection row
bumped version
Merge branch 'release/0.9.7'