Fixed issue when writing data with encryption enabled and block size was exactly AES block size
Merge remote-tracking branch 'refs/remotes/origin/development'