Merge branch 'release/1587p002' into devo
next step in devo
ready to finish release branch
Merge branch 'release/1587p003'