Merge "Code simplification" into experimental