Add changes from RF 2.8.7