Drop down test fixed
Merge branch 'master' into editpage
Merge branch 'editpage'