merge release to 8.5; revert features not included in release