Merge with changes on bodacious