lint/guidline changes
Merge branch 'monitoring_attribute' into keep_version