Version 12.2 (Again)

Added more commits under version 12.2