Merged changes from previous commit