Merge "Finalization scripts bugfixes."