merged changes from mixan946:master