Merge changes and fixes from develop branch