Improved child station identifications
auto-merge staging into master