v1.0.39.0 - commit 2