Added header for approval
merging masterLDAP branch with master