Merge "WIP: [doc] completed feature model"