DC | #4124 #4118 | Bug fixes and updating user guides