Last Changes

- refs BT#7674 BT#7673 BT#7675