Merge "Avoid master queries on deletion form view"