[642] Changes from stable
[642] Template update from stable
[642] Updated API to use search
[642] Removed word draft from draft guidance
[642] Updated step 2 text