Remove "Remove field refactory", and get fixes in other actions

This pull basically does the following:
- remove "Remove Field Refactory"
- sync with upstream
- contains the all fixes for: #11709, #10731