Master activemodel inclusion chain fix ii

Fix for #11004