Merge good changes from branch view-image