More updates
Remove additional new action
Merge master