Re apply

#831198
#831233
#831365

This thread has been locked