Merge "Fix build." into master-nova