Change some setters signature
Merge commit '5dc8f29fd30e9ecc9fe315460e6f8b05d1e7b1bd'
Merge commit '1c22ab0c5ec2ef52222646e58a4d0e7b99a52927'