Merge "Fix problems during build/deployment process"