Om5.1 with python Merge this branch with disabled python tests to get all fixes we have so far into mainline 5.1 See merge request !37