Version 1.1.6.23 merged