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