Initial commit of bug fix branch