[#NP12] Bug12 Commit from GH