Merged from 4.1.1 and fixed success message