Merge "Fix encryption/decryption of large blocks." into qt-dev