Changes due to upgraded features module to 1.0
Mark absent_id and phone_id as private
Merge branch 'features' into merge