Respect supervise option at Master
Changes based on review feedback.