Merge "Set python version 3.7" into elalto