039.02 Intermediate commit - merge tinyg code