Version up: 1.5.4 and JB workaround 1.0.12