Added changes that were applied to 3.2.9