Add apply button
(cherry picked from commit 713201b)