.......... [DEV-539] updated to the latest trunk