Merge "Revert "Update Stacklight models""