Merge tag '1flow-0.28.1.6' into develop

0.28.1.6 1flow-0.28.1.6
Bootstrap 3 corner-cases port continues…
version bump for 0.28.1.7.
Merge branch 'release/0.28.1.7'