Merge "Allow adding of completed empty files." into jb-dev