Merge branch 'development_0.9.6/2.2.3' of gitlab-dhendriks:binary_c/binary_c-python into development_0.9.6/2.2.3