merging building services into 3.6-dev

merging building services into 3.6-dev
PR #443