Updated from master and fixed editable property