Merging changes, Regenerating build 32bits [ci skip]