039.03 Intermediate commit - merge tinyg code