Change some setters signature
Merge commit '5dc8f29fd30e9ecc9fe315460e6f8b05d1e7b1bd'