Merge "ISIS Yang model compilation issue"