Synchronization with latest changes from version 3.0h