Merge branch 'atykhyy-as-binary'