Merge "Remove STOPSHIP regarding hiding options menu"