Manually syncing latest changes from develop branch.