#4137 general Architecture tidy