[PLAT-5543] Added further type reinforcement around master interfaces.