Development code merge

Prior to release