039.10 Merge tinyg code; testing