Merge "Fix development comments"