MSINM-6: Support for site-specific layers