more lazy check on gid
Mert pge branch 'salt' into develop