Merging changes from the 'develop' branch