finished 1587p008 release
Merge branch 'release/1587p008' into devo