Merge "changed to comply with strict aliasing rule"