Reintegrate changes from previous commit