Merge "Enforce the overlayable mechanism for self-targeting"