Merge commit 'origin/andrei/type_conversion'