WIP
Merge branch 'release/1.6.8'
Merge tag '1.6.8' into develop

Release 1.6.8