Merges from SKY branch: