Merge "version 4.0.5 small fixes on buffers size"