Merge branch 'release/1587p008' into devo
restarting manual effort
did 1587p009 release
Merge branch 'release/1587p009'