Update of latest changes in development fork

Update of latest changes in development fork