gcc does not want variable with same name as type
Merge branch 'subscription'