cleaning up release 1587p004
Merge branch 'release/1587p004' into devo