refs #4843 Changes from the develop branch

Code on develop branch was more up-to-date. This prevents merge conflict and also includes changes which gives users to load logs.