Merge "Small fixes in ApprovalForm.java"