Merge "Backward compatibility to credentials in conf"