Fixes: #2434 mac should be changed back to non mandatory in system