Added Advanced Settings

(cherry picked from commit 43c449531f4d9b5015775f050e008f46462ba228)
(cherry picked from commit 6466d2626b7b13355b79601e6f58a38fe4d0ac5e)
(cherry picked from commit bf4036404422f987faf36b243b4a40bb4c7969b9)