#4137 general architecture tidy
#4137 general architecture tidy
#4137 general architecture tidy
#4137 general architecture tidy