Merge commit 'v2_1_2' into debian