Merged changes from technical run