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