Slight changes

[Branch: dev1.2.6]