updated from Studio-42:2.x

merge with Studio-42:2.x