Merge v1.1.4 to TechMastary