PAHMA-1063: Initial commit