final commit after merge from berico