#532 - working on product edit