Issue 1218 all-in-one