Manually merge in animate branch fadeIn work