Merging fixes and SW updates