Bring changes of 0.3.7 func t1 mod into 0.3.8_development