Merge "Add null check to embeddedAllowed check" into klp-modular-dev