Merge branch 'master' into block-cipher-decrypt