Merged with v1.1.6 beta