Merged changes from other machine - mostly cosmetic