Initial commit for BRKDCT-1302