OAK-1263 r1. initial implementation
OAK-1263 fixing Apache headers
OAK-1263 fixing formatting
OAK-1263 fixing formatting
OAK-1263 fixing formatting
OAK-1263 merging r1 branch