Merge change by coolo to break cycles
Simple version update