Fixes: #1812 moving intranet attributes from core to the intranet plugin